bitkeeper revision 1.1159.258.117 (4283790fhpDiiKA-POixMtbhwAG92Q)

mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0:
  Honour EXTRAVERSION when trying to re-use a config file from a previous build.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index 482bbb359cf1e12b351eec06e7116bc5fd4f14a5..dfa13af497759a7396731946892d5adc3d28e980 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
 
 EXTRAVERSION = xen0
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -39,8 +37,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
        # add ebtables patch
        ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
        # Re-use config from install dir if one exits else use default config
-       [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-         cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+       CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
                $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig

diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index 4053fde7d7a40f99bfbd9afabc3a739681d6ff97..92ade5e3aca5e2798d7d9160868732bbe419ca91 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
 
 EXTRAVERSION = xenU
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
-       [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-         cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+       CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
                $(LINUX_DIR)/.config
        make -C $(LINUX_DIR) ARCH=xen oldconfig

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 5eaa81ecc4313fe4962010b87c5c4110015fc5e5..f55cf1a99563694dcd8f7b52294ee8c21921cd52 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
 
 EXTRAVERSION = xen0
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
-       [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-         cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+       CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index b7dd42418443c056e68d595cb0d322dff013a34b..ac115ee372799d9a1052b8f0caaf101708ff3ddc 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
 
 EXTRAVERSION = xenU
 
-FULLVERSION  = $(LINUX_VER)-$(EXTRAVERSION)
-
-LINUX_DIR    = $(OS)-$(FULLVERSION)
+LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
 
 include buildconfigs/Rules.mk
 
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
          sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
          rm -f Makefile ; mv Mk.tmp Makefile )
        # Re-use config from install dir if one exits else use default config
-       [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
-         cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
+       CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
+       [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
+         cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
          || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig